Merged.

diff --cc tools/examples/Makefile
Simple merge

diff --cc tools/python/xen/xm/create.py
index 9f476038cc91ce2d84f6dbea1d89664d71534b02,0f5333d091f8a37dcaef9389e3b50acc47c0a356..5bdb8ebf00f0fe856e43a904439bb878b8d1b009
--- 1/tools/python/xen/xm/create.py
--- 2/tools/python/xen/xm/create.py
+++ b/tools/python/xen/xm/create.py
@@@ -553,12 -539,12 +553,12 @@@ def configure_vfr(config, vals)
           config_vfr.append(['vif', ['id', idx], ['ip', ip]])
       config.append(config_vfr)
  
 -def configure_vmx(opts, config_image, vals):
 +def configure_vmx(config_image, vals):
      """Create the config for VMX devices.
      """
-     args = [ 'memmap', 'device_model', 'vcpus', 'cdrom',
-              'boot', 'fda', 'fdb', 'localtime', 'serial', 'macaddr', 'stdvga', 
-              'isa', 'nographic', 'vnc', 'vncviewer', 'sdl', 'display', 'ne2000']
+     args = [ 'device_model', 'vcpus', 'cdrom', 'boot', 'fda', 'fdb',
+              'localtime', 'serial', 'macaddr', 'stdvga', 'isa', 'nographic',
+              'vnc', 'vncviewer', 'sdl', 'display', 'ne2000', 'lapic']
      for a in args:
          if (vals.__dict__[a]):
              config_image.append([a, vals.__dict__[a]])